Initial work
logic thus far
PR corrections
Merge pull request #333 from yoavgurevich/issue303

Issue #303: Performance Test Fix-up