Removed Zach's random stuff
Polished and shiny