Added some skeleton stuff