Add wait views WiP