More progress on collision detection

broken parts commented out