moved code out of domain layer and into service layer where it belongs