Near final

Movement is funky