This needs to be a feature, stat!