Speedup tasks

I ran the selenium tests against this branch with no issues, so from my perspecitve it's ready to merge.