Baseline 2 work

Copied over from /test/ to /knowledge/prototype/