Working on it some more.

Here's hoping I can remember this stuff.