Added factory, finished capture object. Some errors