These should leverage our new require stuff.