TO-DO List + last sql changes