WL-3582

This depends on #13 before being merged.