Version1 of Assignment #2

Hopefully this is right?