Incremental progress. More glue, mostly. Still not fully funcational.