More uncommented crap to be fixed.