WIP: adding element id's