Added TODO
Finished elements and attributes