More progress...
Almost done with untested conversion, one function to go
:)