Lab 2 beginning

Lab 1 is complete, but I forgot to commit it when it was done. This has
all of that plus the beginning to lab 2.