Finished Assignment

Filled in the skeleton code provided