Added a bit of skeleton functionality