Commit in actual task code
Fixing package.json and some other small things