More work around skeleton (Now with fancy comments!)