Reworked the jsonparser, still need to rework this into a separate repository