Finally, dataviz working. Still some code clean up.