Code complete on qw rewrite, some tests failing