Refactoring of classes completed, tests are working. Refactoring on tests pending
Refactoring with Josh completed.