I think we can split this to 2 features, one after the other.