WIP: More work for eq builder