Rearrange so things that should be edited are up top