Second version committed; Lab1 complete