master branch rebased + tasks