started implementing room concept. Still broken