Finished porting; now comes testing