Consolidate, rename tasks
Create SPEAR task
Minor formatting