Skeleton added. Tidying up.