Added lots of skeleton work