Fleshing out the framework some more.