i _think_ this is the rest of the v5 (json) support