provide feature, add header, have a command

I was playing around with your code a bit, and added some niceties along the way.