- Refactored Controller / Model / View Additions