Fixing a little too much commenting out