Major overhaul of the methods and classes to not be so invasive.