More progress on PlayByPlayWindow