Slight refactoring to go ahead and get a common return structure started