Changed runtest to work on office machine; almost finished Categorizer refactor; 32 tests passing and 1 failing;