WIP:  Improve classes further.