yet more TODOs => issues (up to 17)