Lab 6 final commit