Committing changes before going to dinner...

Will continue later...