Back to square 1 with room

Manually rolled back faulty modifications regarding the room class.
(Don't have git installed properly @ school, so cannot rollback through
git)