Maybe finished collision detection :/

I'm not sure, as I haven't tested it yet, but I might have finished it...hoping it works!