Work on GUI + DB
Conflicts