Added first version of component and template