Class concept now has attributes and looks much better.
Conflicts resolved