Latest JSON Code

Made JSON go to a Map and also made some unit tests.