Prep for lab3 with updated lab2 files