Completed through prob7

Signed-off-by: wshanley <wshanley@gmail.com>