added collision detection
updated todo list