im about to go and make all files as consistent with each other as i can