Although I like the idea, I feel uneasy that that our commented out and part of this PR. Either uncomment them or remove.