Started major refactor of SOAAP source