Some of this would be nice right now