Groundwork for switching to layer-based subscriptions.
Layer preparation.
Layer work.
Layer work.
Layer work.
Fix csv http server.
Layer corrections.