Adding design-time support

gotcha, will revert.