Make this feature cat happen!!!