Class based (44/47)

Class based