Merge pull request #17 from nelsonriley/feat/charts

Feat/charts