finishing loading

Added service and test file