Include Carlos work in the whole app. Working!
Merge pull request #1 from paulld/add_carlos_work

Include Carlos work in the whole app. Working!