Readded stage 2 of match game
Implemented data source methods