working on yodawg yo creation logic
Merge conflict