Initial work on per class info

Needs debugging, there are issues.