Wrapping up lab2 for submission