- removed unneccesary closure
 - reorganized exports
 - added wrench dependency