Moved a few things around.  Added ET calc for long and short periods.