Adding some more functionality to eggs, need to do tests