Another reworking.

Basing some code off Emacs Live as well.