Did massive tidy.  Did todo list