Inicio basic structure finished
Merge branch 'trying-something-else'