filled out skeleton a little more