Moving works in a grid-like way now. HELLOOOOOO MERGE CONFLICTS