Some more porting in progress -- broken