Sweet ok thanks, first time playing with `when` I'll make those changes.