Much progress hooking up the new stuff