Adding design-time support

wait isn't useful if it waits *after* the app is done