lots of updates, started adding collision detection... dont run into stuff yet