Assignment 3 - major updates over Egg Hunter