Working on a custom building

Also lots of other things for v3.1.0.