WIP - refactored plots