Ok, more porting. Getting there