Fleshing out some more functionality