added TODOs for Peter, thats me :o