WIP: part of the way through moving from json to aeson