Premium ondemand

Addresses #314 and #614.

See those tickets for details.