flesh out Class 3 - #24