Flesh the skeleton out a bit