Making Production Ready. WIP