Rest of the hotel changes

These are the rest of the hotel changes. The first commit was mostly to
test of the commits were going to actually work.