Worked on this last weekend, commiting before shutting down.