Merge pull request #685 from brooksryba/develop

Develop
move chart draw
Merge pull request #686 from Tendrid/develop

move chart draw