Work on the arrow movement

This is currently in a mess