ActionResult refactor to store structured results

Comment should start with "Finish ..."