First commit after refactoring.