Some more testing code
added tbd comment