Move save to controller