Fixed movmement. Need to cleanup but works.