Add tasks for #61