adding stuff for lab2, almost done