reworked some more, movement 90% done