Start unifying 32 and 64 more

Part 1 of X

Signed-off-by: Alec Ari <neotheuser@ymail.com>