homing works, includes new state model