Prepare skeleton stuff
Add skeleton handling