Initial commit.  Updated from original to work on tools.  Cleaned up