Adding design-time support

this looks like a bad merge, will fix.