Cleaned up Tools.cs, struggling with Merging