Getting rid of Factories

GLOB IT GLOB IT GLOB IT GLOB IT GLOB IT GLOB IT GLOB IT GLOB IT GLOB IT