more dev rearranging