Fleshing out more of the scriptable parts