Added beginning of new component structure