Keep count of games functionality

Still some minor bugs to fix