First Actions. Doesn't compile yet.
Merge branch 'controller' into mauricio
Changed actual filenames
Actions that compile
Merge branch 'mauricio' into controller