Refactoring to further compartamentalize the Model and System objects from main flow. Started HetGo code.