Final Changes

chris coming in for a late finish!