Refactoring still in progress: AllToolkit done