A bunch more configuration moving and such