updated getters and setters and resupply functions
Merge branch 'master' of github.com:rcarson/cc_scripts