Final Commit - Data storage and YAML working optimally