Added suggestion from @litzinger to to-do list