Started govtgenerator refactor