A recommit

September 2014; Hopefully this works now.