more rearranging as i find what i like!