Did some more scaffolding, hub tests done.