Progress on lab04, but not finished