Added a sidebar.  Refactored a lot of things.  Did some things in the TODO, add some new things to it.