Removing JSONParse, using buffer strategy
Still not working, but in progress
Restored all tests