Stable commit ...
Added a few classes (not implemented yet)