More work on making validating/building generic to any agency