Changes to make things slightly more web-workers-centric