add todo item so I don't forget; it will only come into effect when this branch is merged