First verstion of the docking.
Cleanup.