intents refactoring (in progress)
Merge branch 'master' into beta