going to do a major load test, refactoring to that