Intermit commit.  Still refactoring, nothing works yet.