Solved #48 while waiting for #47 to complete.