Added new elements

Merging what I have.