Moving some stuff around for a code rehaul