Can you switch this to using modules and calling `super`?