First cut of changes for OKFN