Is this always going to be commented out or just for the time being?