Updated build to include wrench for proper template cloning...

Slowly cleaning this puppy up