Created framework for the Factories, and modified the classes they use
to streamline the process.