Class based (45/47)

Class based