Removed all of the 'putExtra' to the intents, they should be handled by the model.