Fix bug where you couldn't add more than 10 tasks
Move code around to add mechanism