Collision checked, broke locking though
Revert "Collision checked, broke locking though"

This reverts commit cc1021dc9ad35a336ba834791b13b60423f0c03d.
Revert "Revert "Collision checked, broke locking though""

This reverts commit 61faafd2268e2d4c193400d6664571a92965f18d.
fixed locking and collision testing

some bugs left in bounds checking.
Merge pull request #3 from Vaevictusnet/collision-checking

Collision checking