Added the plumbing, plus code for introspection.