Added a component system in. Revised some of the Component system to better fit this program.