Might be nice to write a quick test that makes sure that this actually gets called on startup?