More rewrites. Soon everything will be an entity, then only collision handling needs to be done (detection is working already)