• Split more code out to leverage existing framework
• Fixed bug where modifications were being applied to the classes, not the objects
• Removed unnecessary (and conflicting) super calls on self.extended