touched up lab1
finished first part of lab 2