moving things to a controller