a lot of unfinished stuff but it builds
Merge branch 'develop' of github.com:kvendrik/sense-of-urgency into develop