Added all S3 games, refactored out a couple variables