Added more skeleton code