Added basic collision and test code