more changes to lab 4, first few tests now work