Task 1 done. Task 2 functional. Stubbing TBD