more bigtime refactoring.