Factory - added a FIXME since instance of isn't working
Model merged - needs more tests