Fleshing some more stuff out