Added start of plotting macro, not complete