More progress/porting