WIP: faltan controladoras #39

Draft
fede wants to merge 4 commits from Vista into master
4 Commits