BigBigBig refactoring
Complete refactoring. All tests passed.