Further work, added charting