porting a few more files.