Finish adding everything using the MELEE macro to json raws