more incremental work

still does not compile…