Unplugged

Mark van haitsma unplugged rework