Begin refactoring Result for move to hierarchical reporting
Some more Result refactoring