refactoring component
refactoring component
refactor and updates--  still WIP