Unborked additional tests
MainView now almost draws Supply
Dover pls help