started to move work into fit step
work-into-fit passes unit tests