refactoring around towards greatness.