Added lab2 stuff