Add some more skeleton stuff