Reverted most changes as comments

I am going to add one at a time to look for errors