Second Take Assignment

Reviewed code for second take of assignment.