Flesh out the functions a bit.