Toughen up build
Continue refactoring
Merge branch 'master' of github.com:aztech-dev/events