Interim Iteration of Merging Classes

These are nearly complete