Pulled from working desktop.

Tested and in working condition.