Skeleton now roughly complete