I changed above to use just the entity class. A lot simpler. I guess I was just testing what entityunit can do :)