Added more charts very dirty right now