Add a couple of features

Only a couple, *literally* :P