class refactor, added to tools instead of settings