Add lots more skeleton