first commit of lab 4 plus lab3 stuff