Make progress toward fixing collisions
Make basic map movement work again
Somehow handles map movement correctly