@brettweavnet moving it to the other class will remove the need for the json/cli conditional (as it's already been determined that we aren't rendering json)