Not sure if I did it correctly, I have to learn more about the git squash. Let me know if it's ok like this or should I do a new, from zero, commit.

Thanks!