Add the Database service to the default service list.
Add the Database service, move Watch into the queue after the Database service.
Add Pixie/Database builder (requires fake adapters..) and use it for queries.
Move Fake adapters for Pixie into the main repository.