this is commit taking lab1lab2 stuff into lab4