All 5 points done. Final testing before we do the final refactoring to remove all debug code.