Adding FormControlStatic to get rid of helpers.
Moving calculations into a domain model.