Proper handling of _id for draws
remove draw type. persistence test