First tasks added, closes #6 and #7