More R3 porting, added some necessary TODOs