Refactor

I've created a refactor branch, and it's now capable of simple plotting. I'd like to bring it back and make it the master (not merge!) so I can start ticketing specific issues and share it with folks ...