Basic pickup functionality implemented, can now spawn pickups that will draw to the screen. Need to finish the rest of the pickup functions.

Rearranged some of the collision code which makes the game a lot smoother, A LOT less calculations per frame than we were doing previously.