Made WA query run on another thread and "cleaned up" code
(in reality, the WA-related code is horrendous)