element overhaul (WIP)