Adding design-time support

wierdness here. I'll revert this and make my additions again