New database logic tested: is working. Now it's necessary to propagate it to the whole app.