Revert to this revision

TODO: copy over the relevant bits from Rik's [http://surriel.com/research_wanted/ research wanted] page and add more detailed problem descriptions.