Land v3.1

Still more refinements to go, but getting closer and closer.