Revert "Revert "Entities, collisions and movement""

This reverts commit 69bfc0611f22316612206932e9c07ce691a87906.