Branch with the flgen_plate model and other changes
Switch to using factory