Added rough WAI skeleton