Committing this week work so far