Merged files. Lab 4 complete