WIP - Implement new ELD instances