Skeleton fleshed out a bit