add uuid, need to add ability to query now