Lot of work on the skeleton.  Not working yet