adding chart functionality
merging with master