Last commit before going home for dinner. See comments in code