Pushed changes to make json parsing actually compile and run correctly