Mbiel/lab3

Lab 3 mostly complete