Further fleshing out of foundational code.