Merge pull request #2 from BlakeLawson/marco_changes

Marco changes. Seems good?
Updated chart
Merge branch 'work'