Making some progress... slowly fleshing things out.