Added Service layer and tests. All Tests pass.