WIP - fixing some code and adding some soap utility work