Reworked some charting

Awaiting Final Search functionality