finished challenge 1
Revert "finished challenge 1"

This reverts commit 3cf00c983e250e9042c03480db2fa60e0c370f2f.
added service classes
added validation to challenge2