jeremy/isaiah easter eggs
merge