First stab at adding in OxyPlot and some refactoring