A bit more work on service structure/layout
Formatting and a few more entry points...