Assignments 1 & 2

Addresses issues #1 and #2