working on f1

Doing f1 changes
Working on f1

almost there
Working on f1

Feature1 finished
Merge pull request #2 from RodrigoJimmy/feature1

Feature1