Eggification

Previous pull request rebased and updated