Ian: move production code into production fields