continuing redesign, started added user service