Added in some more JSON conversion. I am thinking that for some of the returns a separate method may be nice to convert to JSON since it can get messy.