move tooling into own class