drafts of service layer, fixes in naming