Added charts and Nick's updates to core.clj