added a few components but work needs to be done