Updated to make leaf classes in a hierarchy - final.