ActionResult refactor to store structured results

Will do