Continued with migration towards half-decent interface code
Further migration to parent/child structure.