:+1: for consolidating, although I think @someara can take care of that when he merges.