Added NodeFactory

NodeFactory now complete and working.