Assignment 2: Tiny model adjustments. Ready for UI hookup