More TODO
Fixing issue updating dates where the stored value is null