Refactored component factory and stubbed out a few more classes