Added vectors for moving, and refactored some.