Commit before pulling Jesse's changes
Made minor changes to movement checks
Trying to merge again
Final little changes