FINALLY fixed the issue with the X-es
Working on implementing room-lookup