* Rework Composite
* Rework Commands