Minor rearrangement.
Just reorganising really. Am trying to figure out appropriate behaviour for inherited methods that use '_super'. But I'm not really sure what should happen, so I kneed to figure that out first!