started adding factories
merging