Initial check in from post refactoring.