Update with work on WS announce.
Re-add a bunch of lost files. Agh.