Move stuff around a little