Worked a bit on the skeleton