work on skeletons & reorganized models