Lot of work on DB & frontend