push a bunch of old changes i had related to inner classes and such... hope this...