Refactored to ensure good component integration and refactored out reused code
Merge pull request #22 from mikemases/Component_Integration

Refactored to ensure good component integration and refactored out reuse...