For #63 added a few TODOs