Add some copy constructors, minor work on Room