Finished up part of lab 2