Yay corrected things to the point we've left off in construction. Still many many many errors awaiting us. At least the behaviour so far has been as we want it.