Moved simple logic from model to player