Add/virtuoso to master

Collapsing virtuoso addition before moving on to frontend config