add some missing pieces

I have no code to play with, so I cannot fill in the [TODO]s