cog

omnibus actual concurrency and major refactor

#1530

Merged