Added self, half added super, started a more complex test