Major bugfixes to lab 7 including JSON formatting change