add some controller logic
Merge branch 'master' of https://github.com/nambrot/late-night-safety-kit