Attempt to exit cleanly
Support construct building.. though it has to be in a pretty specific format..
Tweak