More progress on skeleton stuff