Merge branch 'zecke/features/big-rewrite'