eod

Tons of changes