Finish porting latest version

Now to test for any issues...