Finished the refactoring. We're ready to continue working on the final 67%!