Partial commit...end of day and backing up work. PD-361
Add migrations. PD-361