Completed Lab04A and cleaned up project