More work on how to get entities working