WIP, some int4 changes