@sedroca This looks great, thanks!  Do you mind to fix the spacing on your if statements?

Thanks!