Adding TODO changes for LAB 2