Class based (40/47)

Class based