Significant structural changes to model and framework.
more framework refactoring
commit