Better support for multiple floors...

Start of serialization code.