Started moving views over to intents