Worth a TODO marker?