Addresses copy changes needed in #15 and also takes the source order changes pushed in #17
Merge pull request #18 from NYC-Camp/add_copy_changes

Addresses copy changes