Progressing on the refactor.  Added new abstractions and continuing to work on the resolver piece.