Polished up the model. Moved the choice to output into the model parser.