In progress, beginnings of multi-class structure