A couple useful features that we should probably include