Resolve a TODO