Moving across to new db with better time management - BROKEN HERE