working on collision detection/handling - 20140405-1226