Some refactoring to soap builder and soap danske. All tests now pass.