Added some of the json framework
Left over files from the last commit + the test directory