Forgot to account for moving below 0 in the x and y, silly thing to forget!
Merge remote-tracking branch 'origin/master'