gradually refactoring to clean up and use new infrastructure