Tasks 1/2 update

Update to reduce code for tasks 1/2