Working on porting to x86