Almost done (the app have to be refactored and tested)