Further refactoring and bug fixes.  Now in a usable state.