merge changes from design

Signed-off-by: Michael Sears <sears.ma@gmail.com>