we should capture this TODO in Jira