Work from today's stream. Got quite a bit done and I think it's all ready for ModJam.