Big changes to python objects
Added conversion of objects back to json