merge of the new user code that uses yaml.