Add the missing pieces
Moving some stuff around