Work in progress
Fixed movement and remade collision
Forgot some debug lines
Forgot to change some constants