Temp service and cleanup

Fixes #41
Fixes #39