move service stuff into controller