Topic soho

@CHenrie Please review. It is not 100% complete yet, but it should be stable enough to pull into development to continue work there.