Started to implement Task and a few fixes