Breaking up the tasks a bunch, adding more conditionals and tags