Starting the integration of the new logic in the engine.

The cluster concept being new (the orange boxes), i need to already review the classes behaviour. The class diagram posted in july is not good anymore.

Selection_679