Cleaning out commented, unused code
Adding JSON fields to allow for marshalling