tried to add skeleton
completed migration
some fixes