intents refactoring (in progress)