FIXING EVERYTHING PLEASE PULL FIRST