cleaned up all the warnings
beginnings of migration
handled merge conflicts
migration coding is finished, does not work, needs debugging