Initial 2.0 rewrite