[W.I.P] Start working towards makings sure data is always accurate, even updatin...

...g data that may be removed