Adding some more skeleton stuff