stage one of room refactor