It feels like code that should be done once at start up.  But I'll merge as it stands.