Decided to use a better chart library

Using test data, cleaned up code somewhat