Add in all the getters so it will return properly in json
Merge remote-tracking branch 'origin/master'