DJR:Added basic collision detection