Revert "Revert "Merge pull request #70 from riobard/refactor/vbx""

This reverts commit 0c4effd44d8dd15b0c9a30d47cbd6d68b7183cbf.

This seems to work now.