Updated for structural changes

now uses classes instead of rooms