fixed movement. ready for primetime