Work-in Progress on Entities