#56 - Initial step building prior to refactoring to use Template pattern.