Finished server refactoring; updated chart.js