Adding design-time support

I figured 2 would require us to at least alias. It sounds like they really are separate options.