committing because i feel like im about to break everything
lots of refactoring.  Dashboard is totally gone.