runModel has been refactored out.
- Whole tree has been fixed; I didn't need to do any commits