Some new stuff.

Minor refactor.