First commit with all the application working fine, just need to make the corresponding test.