@tessi we definitely need to cut out this crap :hocho: 
:+1: for returning JSON - not sure if it'd be in scope for this particular PR though.