Some more conversion
Some more work.