Prep to re-implement tools