Started converting the controller over to use the API