Issue #17: doing some minor design integration