README.md update and some other refactoring.  This is still in a broken state for now.