Initial commit for start of refactoring.