Continuation of 1stDayDemo, but refactored