Turned into class and moved functions to super.