Added small bits of skeleton code