64 bit base compiles, need to test changes on 32 bit