Adding Intents and code review.