getting items and rooms ready for a big refactor