Resolved conflict between tick function and moveToward
Made things work
Merging with master
Still working on merge conflicts
Still needing to fucking fix merge conflicts