More work on compound component
Broken - issue with cloning....