Finished Lab_06 Extra Tasks

Need to test with more maps as well.