Starting to add ability to manage components