Putting in the feature I hope to one day pass