First pass at GMs - not adding boolean fields