Gaimca casi funcional

My pull request for you to sync!