Lab 2 mostly complete, still need to fix the first problem