Updating code. Zach's cleaning my crappy code.