Working on basic functionality
Merge branch 'master' of github.com:TimoorKurdi/wdi_project_two