Switched to AESON
Moved to template haskell aeson
Added more pieces to the JSON