More room enhancements, still not working or tested code