Added Factory methods, moved TestMain, started changing GameContainer