Chart js

Replaces #1749 
To check that it _isn't_?