More work - skeleton is working now