Commented some stuff, might have broken stuff