More work on moving to result objects