Fixed commenting so it works, needs ui fixes though