This should leverage our new `require` stuff.