Merge pull request #31 from deanwillis/level2

Ongoing Level2 (AD and Gen-Art comments)