Starting to Decouple Entity Behavior