json parsing working, unit tests passing