Move actions to controller where it seems more logical