gut check
base architecture in place
re-update