Refactor
got rid of 32bit centeredness
Refactor