Components (worki in progress)
Finalizing components implementation