Added some input validation
Added a tuple for checking services
Initial cut at validating inputs
Fixed a typo
Second cut at input validation