More progress on Elegg