Subspace ground push2

First real test of patching.  I've tried to put all our patches into BEGIN/END NICTA blocks.