More work on migrating data from old system