Starting to add stuff about units and ele names