Logic taken out in a separate controller
Merge remote-tracking branch 'origin/master'