Working on adding components
More work on component