WIP: Start using new plot structure