Fixing build

And making sure that the in-memory Work's identity is updated
Updating TODO marking Database -> Memory as done