Ooops! Just realized I rebased over your PR on the plane. 

But, yeah, let's get loader into it's own world sooner rather than later.