switching to the new taxonomy model (lots of things to do yet)