Tidying up
Editing
Don't really want to show todo items.
Editing