Switches to using ++ for concatenation

Also adds concatenation for classes.