Moving some things out to a seperate view/control