Minor changes to vaultmodule (work in progress).
Resolved conflict (hopefully...)