Minor refactoring  Now able to use both moces and voces + uses more functionality from seal