Still busy reworking the design to fit the entity & component & system approach.
Certainly makes a lot more sense, since it quickly becomes apparent how much re-use you get out of generic classes.
Also, utterly surprisingly, nearly exactly how we approach and program industrial control systems...