Easter egg tidied; will have further progress l8r