add class definition
merge vincent's
room struc
Merge branch 'room'