Add element lists and WIP