Large, comprehensive update for beta testing, round 1.