Adding more skeleton code