Messy todo, more entity references