Partially fixed to functions for better overviews and stuff.  The Will collide still doesn't work though. Needs fixing