some left out TODO thought
left out header for the patch