daniel commits
all of danniels changes , this is a bad commit