0.9: Updating the todo with things that need to be done and any name
refactorings.