Topic oss2

This is a major refactoring, which you can pull into master. It will likely break your stuff