109 list vault 2

These should use the self.create_* functions to set the values.