Flesh out skeleton some more