Overhaul tools - AGAIN.  TODO: Fix the .dat files - right now they won't load!