Stop refactor. Prepare to bring in BidRecorder.
Merge branch 'refactoring'