more code ported; enabled adding services