Refactored to use YAML for data
Pushing whatever is on my old laptop