Skeleton move done. Several small additions