Refactored according to drawing today, movement not working right now