I need to get better at removing debug code...