Random and hopefully good changes.

This change is a good idea. We should definitely switch to `$timeout` service.