Should work, just needs polishing
Merge from Richard.