Worked through the TODO list of the readme