Functionality working - delete wip
Merge pull request #15 from thatknitter/factory

Functionality working - delete wip