WIP - extract services from main