completely Entity based now.