Moving some stuff around before adding a few updates