updated Room, and progress on Save and Load