Made some QoL changes and moved bits of code around trying to figure out collision detection.