Converted some more code over. Slow work.