reorganizing and prep for move to backbone