Another WIP commit.

 * NOTE: This should really be ship shape and usable by others. doh.