Dropping the two initial things I thought would be plugins.  At least, for now.