CDB-4232 Mostly a bunch of TODO's after exercising a bit the code