Getting close to deploy-able