Lots of refactoring and work on rendering.  Still a lot to do as I'm not yet rendering anything.