Charts Working

Charts Working now, but not pretty