[WIP] JSON encoder refactor