Add helper class, and split into Articulate