Added concatenation/equals and reorganized