Got rid of Elzabad's beautiful code in exchange for more shiny code.