Did some refractoring of a couple classes. Saved the changes to separate
classes so I didn't alter the inner working of the other classes I
didn't get around to. Figured we could review what I have and decided
whether or not to move forward with the new classes or stick with the
old.