Engine rewrite complete