Lab 2 mostly done