Begin big code rearrange