Finished the entity design