Back to Work

[billroper]

Today was spent trying to sort out various merge artifacts. I think they're cleared up now and we should be able to make progress.

That's the objective, right? :)