Second attempt at this kata