Fixes #3

Implements Service Architecture