Ok I'm merging. We can improve this once we get more mpl input.