Commented Code

Migration is progress