Continued work on lab2