On my way to solving the bug. honestly though, this should all be re-written (which it will, just not yet)
Removed unnecessary definitions in preparation of using DEFINE-JSON-EXPANDER
Removed TODOs
Now uses define-json-expander
Now uses define-json-expander