added pretty much the whole WADL handling system