New colin branch. Added todo list.