ActionResult refactor to store structured results

Hmm, OK, create issues for both and best assign them to you. ;)