Assignments 1 and 2

This addresses issues #1 and #2