ref #71 missing classes in last commit