Rejigger for order of deps, HURRR, DERP...