added logic components
Merge branch 'master' of github.com:mutac/query-challenge