fleshing out more stuff