Move this back into controller