Commenting some stuff to be refactored later