This would be an awesome feature