Didn't comment out some test code. I really need a better testing solution.