adding in save awareness
Merge branch 'master' of https://github.com/timera/NewChao