First cut of productionalizing
More changes
More checks and balances