big commit with to many changes for leaving a message;