WIP refactored plots