before major changes
Added collisions - Rewrote 'vector' stuff