added bulk of code
Merge remote-tracking branch 'Tasker-Github/master'