Most of Lab2 done; changes to all lab2 files