Fields working ok, refactored to use Controllers on picklists (eg types)