Updating ToDo, probably need to go through it again and see what's complete and what isn't.