Service container

fixes #7 #9