Adding miscellaneous tools.  Move some functionality to this.