Rewrote some tasks for easier mix & match possibilities