Major update, in prep for merger with Bailador.