At this time I think Lab1 is complete. Changes are in comments