Handled some todos in intro - Mario