latest stuff. Have some better ideas for making classes