mostly working, some cleanup remaining, now allows new player or round