quick stab at integrating aimes.bundle and aimes.skeleton
merge from Matteo