We could - creating separate story for this