Started work on lab6
merge