Starting to encounter UI functionality inside data functions.
Committing before work on splitting Model and View.