More TODO items

Signed-off-by: Jacques Marneweck <jacques@powertrip.co.za>