Fogservice rewrite

Pull request test