Added context
Refactored until 1st exercise