Initial commit of lab 2 with corrected issues of lab 1