updates to way we reserve tasks, moved logic to mapper
fixed merge conflict