Finished lab05 and fixed lab04