Made this actually usable as a standalone for Oakland