Done the TODO

Needed it without the dependency on mongoDB