Need to fix up the final part - querying WA