Moving some of the definitions around