more moving things around,

comment out and just get skeleton of migration and then start writing test