Fleshed out services more